From 1934d3423bf317823de727d81da87f01f0eeb3d0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 13 Dec 2008 05:20:10 +0000 Subject: [PATCH] Fix a typo svn path=/trunk/; revision=21877 --- ChangeLog | 13 +++++++++++++ gdk/directfb/gdkwindow-directfb.c | 2 +- gdk/gdkwindow.c | 4 ++-- gdk/x11/gdkwindow-x11.c | 2 +- gtk/gtkmenushell.c | 2 +- gtk/gtkwidget.c | 7 +++---- gtk/tests/builder.c | 2 +- tests/testdnd.c | 2 +- 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b137a0be4..c3f5c34028 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-12-13 Matthias Clasen + + Bug 563835 – Typo in gtk_widget_has_screen() docs + + * gdk/directfb/gdkwindow-directfb.c: + * gdk/gdkwindow.c: + * gdk/x11/gdkwindow-x11.c: + * gtk/gtkmenushell.c: + * gtk/gtkwidget.c: + * gtk/tests/builder.c: + * tests/testdnd.c: s/heirarchy/hierarchy/ in docs and comments. + Pointed out by Wouter Bolsterlee + 2008-12-12 Matthias Clasen Bug 564066 – Crash in gtk_rc_parse_default_files diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index 22429b755c..42b3500519 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -660,7 +660,7 @@ _gdk_window_new (GdkWindow *parent, void _gdk_windowing_window_destroy_foreign (GdkWindow *window) { - /* It's somebody else's window, but in our heirarchy, + /* It's somebody else's window, but in our hierarchy, * so reparent it to the root window, and then send * it a delete event, as if we were a WM */ diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 798bf68ab4..a0f31f45cd 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -508,9 +508,9 @@ _gdk_window_destroy_hierarchy (GdkWindow *window, { /* Logically, it probably makes more sense to send * a "destroy yourself" message to the foreign window - * whether or not it's in our heirarchy; but for historical + * whether or not it's in our hierarchy; but for historical * reasons, we only send "destroy yourself" messages to - * foreign windows in our heirarchy. + * foreign windows in our hierarchy. */ if (private->parent) _gdk_windowing_window_destroy_foreign (window); diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index eb2ae6c85e..a6d88b9ffc 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1170,7 +1170,7 @@ _gdk_windowing_window_destroy (GdkWindow *window, void _gdk_windowing_window_destroy_foreign (GdkWindow *window) { - /* It's somebody else's window, but in our heirarchy, + /* It's somebody else's window, but in our hierarchy, * so reparent it to the root window, and then send * it a delete event, as if we were a WM */ diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index b0804a9489..910c760d56 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -83,7 +83,7 @@ enum { * * There is also is a concept of the current menu and a current * menu item. The current menu item is the selected menu item - * that is furthest down in the heirarchy. (Every active menu_shell + * that is furthest down in the hierarchy. (Every active menu_shell * does not necessarily contain a selected menu item, but if * it does, then menu_shell->parent_menu_shell must also contain * a selected menu item. The current menu is the menu that diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 02096596bc..8a6beb1b89 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -6241,8 +6241,7 @@ gtk_widget_propagate_screen_changed_recurse (GtkWidget *widget, * * Please note that the semantics of this call will change * in the future if used on a widget that has a composited - * window in its heirarchy (as set by - * gdk_window_set_composited()). + * window in its hierarchy (as set by gdk_window_set_composited()). * * Return value: %TRUE if the widget can rely on its alpha * channel being drawn correctly. @@ -6741,7 +6740,7 @@ gtk_widget_get_screen (GtkWidget *widget) * * Checks whether there is a #GdkScreen is associated with * this widget. All toplevel widgets have an associated - * screen, and all widgets added into a heirarchy with a toplevel + * screen, and all widgets added into a hierarchy with a toplevel * window at the top. * * Return value: %TRUE if there is a #GdkScreen associcated @@ -6787,7 +6786,7 @@ gtk_widget_get_display (GtkWidget *widget) * * Get the root window where this widget is located. This function can * only be called after the widget has been added to a widget - * heirarchy with #GtkWindow at the top. + * hierarchy with #GtkWindow at the top. * * The root window is useful for such purposes as creating a popup * #GdkWindow associated with the window. In general, you should only diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c index d8b87d2711..dd4d9220fc 100644 --- a/gtk/tests/builder.c +++ b/gtk/tests/builder.c @@ -2410,7 +2410,7 @@ test_menus (void) g_assert (strcmp (GTK_ACCEL_LABEL (item_accel_label)->accel_string, GTK_ACCEL_LABEL (sample_accel_label)->accel_string) == 0); - /* Check the menu heirarchy worked here */ + /* Check the menu hierarchy worked here */ g_assert (get_parent_menubar (item)); gtk_widget_destroy (GTK_WIDGET (window)); diff --git a/tests/testdnd.c b/tests/testdnd.c index 75833e2033..f2cc795106 100644 --- a/tests/testdnd.c +++ b/tests/testdnd.c @@ -432,7 +432,7 @@ source_drag_data_get (GtkWidget *widget, } /* The following is a rather elaborate example demonstrating/testing - * changing of the window heirarchy during a drag - in this case, + * changing of the window hierarchy during a drag - in this case, * via a "spring-loaded" popup window. */ static GtkWidget *popup_window = NULL; -- 2.30.2